How to Solve Merge Conflict in Git